From 61914228f9f13bfcbde5b3742e3ad631491d68a2 Mon Sep 17 00:00:00 2001
From: "kaf24@scramble.cl.cam.ac.uk" <kaf24@scramble.cl.cam.ac.uk>
Date: Sat, 22 Nov 2003 11:43:43 +0000
Subject: [PATCH] bitkeeper revision 1.627.1.1 (3fbf4befPIgRjU40eyhadjRuioWcwA)

Many files:
  Lib renames and fixes. Only build shared version of libxc, as the static archive version caused too many problems.
xc_vif.c:
  Rename: tools/xc/lib/libxc_vif.c -> tools/xc/lib/xc_vif.c
xc_vbd.c:
  Rename: tools/xc/lib/libxc_vbd.c -> tools/xc/lib/xc_vbd.c
xc_private.h:
  Rename: tools/xc/lib/libxc_private.h -> tools/xc/lib/xc_private.h
xc_private.c:
  Rename: tools/xc/lib/libxc_private.c -> tools/xc/lib/xc_private.c
xc_misc.c:
  Rename: tools/xc/lib/libxc_misc.c -> tools/xc/lib/xc_misc.c
xc_linux_restore.c:
  Rename: tools/xc/lib/libxc_linux_restore.c -> tools/xc/lib/xc_linux_restore.c
xc_linux_save.c:
  Rename: tools/xc/lib/libxc_linux_save.c -> tools/xc/lib/xc_linux_save.c
xc_linux_build.c:
  Rename: tools/xc/lib/libxc_linux_build.c -> tools/xc/lib/xc_linux_build.c
xc_domain.c:
  Rename: tools/xc/lib/libxc_domain.c -> tools/xc/lib/xc_domain.c
xc_bvtsched.c:
  Rename: tools/xc/lib/libxc_bvtsched.c -> tools/xc/lib/xc_bvtsched.c
---
 .rootkeys                                     | 20 +++++++++----------
 tools/xc/lib/Makefile                         | 19 ++++++++----------
 .../lib/{libxc_bvtsched.c => xc_bvtsched.c}   |  4 ++--
 tools/xc/lib/{libxc_domain.c => xc_domain.c}  |  4 ++--
 .../{libxc_linux_build.c => xc_linux_build.c} |  4 ++--
 ...bxc_linux_restore.c => xc_linux_restore.c} |  4 ++--
 .../{libxc_linux_save.c => xc_linux_save.c}   |  4 ++--
 tools/xc/lib/{libxc_misc.c => xc_misc.c}      |  4 ++--
 .../xc/lib/{libxc_private.c => xc_private.c}  |  4 ++--
 .../xc/lib/{libxc_private.h => xc_private.h}  |  6 +++---
 tools/xc/lib/{libxc_vbd.c => xc_vbd.c}        |  4 ++--
 tools/xc/lib/{libxc_vif.c => xc_vif.c}        |  4 ++--
 tools/xc/py/Makefile                          |  2 +-
 tools/xc/py/setup.py                          |  8 +-------
 14 files changed, 41 insertions(+), 50 deletions(-)
 rename tools/xc/lib/{libxc_bvtsched.c => xc_bvtsched.c} (95%)
 rename tools/xc/lib/{libxc_domain.c => xc_domain.c} (98%)
 rename tools/xc/lib/{libxc_linux_build.c => xc_linux_build.c} (99%)
 rename tools/xc/lib/{libxc_linux_restore.c => xc_linux_restore.c} (99%)
 rename tools/xc/lib/{libxc_linux_save.c => xc_linux_save.c} (99%)
 rename tools/xc/lib/{libxc_misc.c => xc_misc.c} (95%)
 rename tools/xc/lib/{libxc_private.c => xc_private.c} (92%)
 rename tools/xc/lib/{libxc_private.h => xc_private.h} (97%)
 rename tools/xc/lib/{libxc_vbd.c => xc_vbd.c} (98%)
 rename tools/xc/lib/{libxc_vif.c => xc_vif.c} (97%)

diff --git a/.rootkeys b/.rootkeys
index 7d2f1e61b0..3405ed95a0 100644
--- a/.rootkeys
+++ b/.rootkeys
@@ -59,18 +59,18 @@
 3f87ba90EUVPQLVOlFG0sW89BCwouQ tools/misc/xen_refresh_dev.c
 3fbca441SjQr8vJwTQIgH1laysaWog tools/xc/Makefile
 3fbba6dbDfYvJSsw9500b4SZyUhxjQ tools/xc/lib/Makefile
-3fbba6dbEVkVMX0JuDFzap9jeaucGA tools/xc/lib/libxc_bvtsched.c
-3fbba6dbasJQV-MVElDC0DGSHMiL5w tools/xc/lib/libxc_domain.c
-3fbba6dbNCU7U6nsMYiXzKkp3ztaJg tools/xc/lib/libxc_linux_build.c
-3fbba6dbl267zZOAVHYLOdLCdhcZMw tools/xc/lib/libxc_linux_restore.c
-3fbba6db7li3FJiABYtCmuGxOJxEGw tools/xc/lib/libxc_linux_save.c
-3fbba6db7WnnJr0KFrIFrqNlSKvFYg tools/xc/lib/libxc_misc.c
-3fbba6dctWRWlFJkYb6hdix2X4WMuw tools/xc/lib/libxc_private.c
-3fbba6dcbVrG2hPzEzwdeV_UC8kydQ tools/xc/lib/libxc_private.h
-3fbba6dcoGq9hQlksrBUfC2P5F6sGg tools/xc/lib/libxc_vbd.c
-3fbba6dc38q-ioRlwSR_quw4G3qUeQ tools/xc/lib/libxc_vif.c
 3fbba6dc1uU7U3IFeF6A-XEOYF2MkQ tools/xc/lib/rpm.spec
 3fbba6dcrNxtygEcgJYAJJ1gCQqfsA tools/xc/lib/xc.h
+3fbba6dbEVkVMX0JuDFzap9jeaucGA tools/xc/lib/xc_bvtsched.c
+3fbba6dbasJQV-MVElDC0DGSHMiL5w tools/xc/lib/xc_domain.c
+3fbba6dbNCU7U6nsMYiXzKkp3ztaJg tools/xc/lib/xc_linux_build.c
+3fbba6dbl267zZOAVHYLOdLCdhcZMw tools/xc/lib/xc_linux_restore.c
+3fbba6db7li3FJiABYtCmuGxOJxEGw tools/xc/lib/xc_linux_save.c
+3fbba6db7WnnJr0KFrIFrqNlSKvFYg tools/xc/lib/xc_misc.c
+3fbba6dctWRWlFJkYb6hdix2X4WMuw tools/xc/lib/xc_private.c
+3fbba6dcbVrG2hPzEzwdeV_UC8kydQ tools/xc/lib/xc_private.h
+3fbba6dcoGq9hQlksrBUfC2P5F6sGg tools/xc/lib/xc_vbd.c
+3fbba6dc38q-ioRlwSR_quw4G3qUeQ tools/xc/lib/xc_vif.c
 3fbd0a3dTwnDcfdw0-v46dPbX98zDw tools/xc/py/Makefile
 3fbd0a42l40lM0IICw2jXbQBVZSdZg tools/xc/py/Xc.c
 3fbd4bd6GtGwZGxYUJPOheYIR7bPaA tools/xc/py/XenoUtil.py
diff --git a/tools/xc/lib/Makefile b/tools/xc/lib/Makefile
index 3e8e17c65a..949fefd257 100644
--- a/tools/xc/lib/Makefile
+++ b/tools/xc/lib/Makefile
@@ -4,12 +4,11 @@ CFLAGS   = -c -Wall -O3
 CFLAGS  += -I../../../xen/include -I../../../xenolinux-sparse/include
 
 HDRS     = $(wildcard *.h)
-OBJS     = $(patsubst %.c,%.o,$(wildcard libxc_*.c))
+OBJS     = $(patsubst %.c,%.o,$(wildcard *.c))
 
-LIBS     = libxc.a libxc.so
+LIB      = libxc.so
 
-all: check-for-zlib $(LIBS)
-	ranlib libxc.a
+all: check-for-zlib $(LIB)
 
 check-for-zlib:
 	@if [ ! -e /usr/include/zlib.h ]; then \
@@ -22,21 +21,21 @@ check-for-zlib:
 install: all
 	mkdir -p /usr/lib
 	mkdir -p /usr/include
-	cp -a $(LIBS) /usr/lib
-	for i in $(LIBS); do chmod 755 /usr/bin/$i ; done
+	cp -a $(LIB) /usr/lib
+	for i in $(LIB); do chmod 755 /usr/bin/$i ; done
 	cp -a xc.h /usr/include
 	chmod 644 /usr/include/xc.h
 
 dist: all
 	mkdir -p ../../../../install/lib
 	mkdir -p ../../../../install/include
-	cp -a $(LIBS) ../../../../install/lib
-	for i in $(LIBS); do chmod 755 ../../../../install/bin/$i ; done
+	cp -a $(LIB) ../../../../install/lib
+	for i in $(LIB); do chmod 755 ../../../../install/bin/$i ; done
 	cp -a xc.h ../../../../install/include
 	chmod 644 ../../../../install/include/xc.h
 
 clean:
-	$(RM) *.a *.so *.o *.rpm $(LIBS)
+	$(RM) *.a *.so *.o *.rpm $(LIB)
 
 rpm: all
 	rm -rf staging
@@ -50,7 +49,5 @@ rpm: all
 libxc.so: $(OBJS)
 	$(LD) -shared -o $@ $^ -lz
 
-libxc.a: libxc.a($(OBJS))
-
 %.o: %.c $(HDRS) Makefile
 	$(CC) $(CFLAGS) -o $@ $<
diff --git a/tools/xc/lib/libxc_bvtsched.c b/tools/xc/lib/xc_bvtsched.c
similarity index 95%
rename from tools/xc/lib/libxc_bvtsched.c
rename to tools/xc/lib/xc_bvtsched.c
index f7d5b2659e..5ea52224e9 100644
--- a/tools/xc/lib/libxc_bvtsched.c
+++ b/tools/xc/lib/xc_bvtsched.c
@@ -1,12 +1,12 @@
 /******************************************************************************
- * libxc_bvtsched.c
+ * xc_bvtsched.c
  * 
  * API for manipulating parameters of the Borrowed Virtual Time scheduler.
  * 
  * Copyright (c) 2003, K A Fraser.
  */
 
-#include "libxc_private.h"
+#include "xc_private.h"
 
 int xc_bvtsched_global_set(int xc_handle,
                            unsigned long ctx_allow)
diff --git a/tools/xc/lib/libxc_domain.c b/tools/xc/lib/xc_domain.c
similarity index 98%
rename from tools/xc/lib/libxc_domain.c
rename to tools/xc/lib/xc_domain.c
index 9c60bd6ace..f120791848 100644
--- a/tools/xc/lib/libxc_domain.c
+++ b/tools/xc/lib/xc_domain.c
@@ -1,12 +1,12 @@
 /******************************************************************************
- * libxc_domain.c
+ * xc_domain.c
  * 
  * API for manipulating and obtaining information on domains.
  * 
  * Copyright (c) 2003, K A Fraser.
  */
 
-#include "libxc_private.h"
+#include "xc_private.h"
 
 int xc_domain_create(int xc_handle,
                      unsigned int mem_kb, 
diff --git a/tools/xc/lib/libxc_linux_build.c b/tools/xc/lib/xc_linux_build.c
similarity index 99%
rename from tools/xc/lib/libxc_linux_build.c
rename to tools/xc/lib/xc_linux_build.c
index e7acaa8c95..a0176edfc1 100644
--- a/tools/xc/lib/libxc_linux_build.c
+++ b/tools/xc/lib/xc_linux_build.c
@@ -1,8 +1,8 @@
 /******************************************************************************
- * libxc_linux_build.c
+ * xc_linux_build.c
  */
 
-#include "libxc_private.h"
+#include "xc_private.h"
 #include <zlib.h>
 
 /* This string is written to the head of every guest kernel image. */
diff --git a/tools/xc/lib/libxc_linux_restore.c b/tools/xc/lib/xc_linux_restore.c
similarity index 99%
rename from tools/xc/lib/libxc_linux_restore.c
rename to tools/xc/lib/xc_linux_restore.c
index e865280b17..2418d97219 100644
--- a/tools/xc/lib/libxc_linux_restore.c
+++ b/tools/xc/lib/xc_linux_restore.c
@@ -1,12 +1,12 @@
 /******************************************************************************
- * libxc_linux_restore.c
+ * xc_linux_restore.c
  * 
  * Restore the state of a Xenolinux session.
  * 
  * Copyright (c) 2003, K A Fraser.
  */
 
-#include "libxc_private.h"
+#include "xc_private.h"
 #include <asm-xeno/suspend.h>
 #include <zlib.h>
 
diff --git a/tools/xc/lib/libxc_linux_save.c b/tools/xc/lib/xc_linux_save.c
similarity index 99%
rename from tools/xc/lib/libxc_linux_save.c
rename to tools/xc/lib/xc_linux_save.c
index 0986c96cad..463efb7acb 100644
--- a/tools/xc/lib/libxc_linux_save.c
+++ b/tools/xc/lib/xc_linux_save.c
@@ -1,12 +1,12 @@
 /******************************************************************************
- * libxc_linux_save.c
+ * xc_linux_save.c
  * 
  * Save the state of a running Xenolinux session.
  * 
  * Copyright (c) 2003, K A Fraser.
  */
 
-#include "libxc_private.h"
+#include "xc_private.h"
 #include <asm-xeno/suspend.h>
 #include <zlib.h>
 
diff --git a/tools/xc/lib/libxc_misc.c b/tools/xc/lib/xc_misc.c
similarity index 95%
rename from tools/xc/lib/libxc_misc.c
rename to tools/xc/lib/xc_misc.c
index a1fd45a19a..dfb550e871 100644
--- a/tools/xc/lib/libxc_misc.c
+++ b/tools/xc/lib/xc_misc.c
@@ -1,10 +1,10 @@
 /******************************************************************************
- * libxc_misc.c
+ * xc_misc.c
  * 
  * Miscellaneous control interface functions.
  */
 
-#include "libxc_private.h"
+#include "xc_private.h"
 
 int xc_interface_open(void)
 {
diff --git a/tools/xc/lib/libxc_private.c b/tools/xc/lib/xc_private.c
similarity index 92%
rename from tools/xc/lib/libxc_private.c
rename to tools/xc/lib/xc_private.c
index c93bed841f..7fa201bc90 100644
--- a/tools/xc/lib/libxc_private.c
+++ b/tools/xc/lib/xc_private.c
@@ -1,10 +1,10 @@
 /******************************************************************************
- * libxc_private.c
+ * xc_private.c
  * 
  * Helper functions for the rest of the library.
  */
 
-#include "libxc_private.h"
+#include "xc_private.h"
 
 int init_pfn_mapper(void)
 {
diff --git a/tools/xc/lib/libxc_private.h b/tools/xc/lib/xc_private.h
similarity index 97%
rename from tools/xc/lib/libxc_private.h
rename to tools/xc/lib/xc_private.h
index 3eb412d436..cdf99260de 100644
--- a/tools/xc/lib/libxc_private.h
+++ b/tools/xc/lib/xc_private.h
@@ -1,6 +1,6 @@
 
-#ifndef __LIBXC_PRIVATE_H__
-#define __LIBXC_PRIVATE_H__
+#ifndef __XC_PRIVATE_H__
+#define __XC_PRIVATE_H__
 
 typedef unsigned char      u8;
 typedef unsigned short     u16;
@@ -166,4 +166,4 @@ int close_pfn_mapper(int pm_handle);
 void *map_pfn(int pm_handle, unsigned long pfn);
 void unmap_pfn(int pm_handle, void *vaddr);
 
-#endif /* __LIBXC_PRIVATE_H__ */
+#endif /* __XC_PRIVATE_H__ */
diff --git a/tools/xc/lib/libxc_vbd.c b/tools/xc/lib/xc_vbd.c
similarity index 98%
rename from tools/xc/lib/libxc_vbd.c
rename to tools/xc/lib/xc_vbd.c
index 3f9e67c2b2..914206c0f4 100644
--- a/tools/xc/lib/libxc_vbd.c
+++ b/tools/xc/lib/xc_vbd.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * libxc_vbd.c
+ * xc_vbd.c
  * 
  * API for manipulating and accessing per-domain virtual block devices.
  * 
@@ -7,7 +7,7 @@
  */
 
 #define _GNU_SOURCE
-#include "libxc_private.h"
+#include "xc_private.h"
 
 int xc_vbd_create(int xc_handle,
                   unsigned int domid, 
diff --git a/tools/xc/lib/libxc_vif.c b/tools/xc/lib/xc_vif.c
similarity index 97%
rename from tools/xc/lib/libxc_vif.c
rename to tools/xc/lib/xc_vif.c
index a3e22ea70b..645be0762d 100644
--- a/tools/xc/lib/libxc_vif.c
+++ b/tools/xc/lib/xc_vif.c
@@ -1,12 +1,12 @@
 /******************************************************************************
- * libxc_vif.c
+ * xc_vif.c
  * 
  * API for manipulating and accessing per-network-interface parameters.
  * 
  * Copyright (c) 2003, K A Fraser.
  */
 
-#include "libxc_private.h"
+#include "xc_private.h"
 
 int xc_vif_scheduler_set(int xc_handle,
                          unsigned int domid, 
diff --git a/tools/xc/py/Makefile b/tools/xc/py/Makefile
index a3488237fc..7a7d86b854 100644
--- a/tools/xc/py/Makefile
+++ b/tools/xc/py/Makefile
@@ -1,5 +1,5 @@
 
-all: ../lib/libxc.a
+all: ../lib/libxc.so ../lib/xc.h
 	python setup.py build
 
 install: all
diff --git a/tools/xc/py/setup.py b/tools/xc/py/setup.py
index 7e2e28da39..6d8f4f83f0 100644
--- a/tools/xc/py/setup.py
+++ b/tools/xc/py/setup.py
@@ -4,15 +4,9 @@ from distutils.core import setup, Extension
 module = Extension("Xc",
                    include_dirs         = ["../lib"],
                    library_dirs         = ["../lib"],
+                   libraries            = ["xc"],
                    sources              = ["Xc.c"])
 
-# Include the following line to link against shared libxc.so
-#module.libraries = ["xc"]
-
-# Include the following lines to link against static libxc.a
-module.extra_objects = ["../lib/libxc.a"]
-module.libraries     = ["z"]
-
 setup(name = "Xc", version = "1.0", ext_modules = [module])
 
 setup(name = "XenoUtil", version = "1.0", py_modules = ["XenoUtil"])
-- 
2.30.2